ostbuild: Only check out source if we need to
authorColin Walters <walters@verbum.org>
Thu, 8 Mar 2012 14:02:46 +0000 (09:02 -0500)
committerColin Walters <walters@verbum.org>
Tue, 13 Mar 2012 14:39:31 +0000 (10:39 -0400)
When using --skip-built, we shouldn't do a checkout if we're not going
to build.

src/ostbuild/pyostbuild/builtin_build.py

index aa7f27216de7fcd539e03c48317b927b8c233786..24736609f820479428bc22cbaf211f1863b1f2f0 100755 (executable)
@@ -100,10 +100,6 @@ class OstbuildBuild(builtins.Builtin):
         buildname = buildutil.manifest_buildname(self.manifest, meta)
         buildroot_name = buildutil.manifest_buildroot_name(self.manifest, meta)
 
-        checkoutdir = os.path.join(self.workdir, 'src')
-        component_src = os.path.join(checkoutdir, name)
-        run_sync(['ostbuild', 'checkout', '--overwrite', '--manifest=' + self.manifest_path, name], cwd=checkoutdir)
-
         current_vcs_version = meta['revision']
 
         previous_build_version = run_sync_get_output(['ostree', '--repo=' + self.repo,
@@ -132,6 +128,10 @@ class OstbuildBuild(builtins.Builtin):
         else:
             log("No previous build for '%s' found" % (buildname, ))
 
+        checkoutdir = os.path.join(self.workdir, 'src')
+        component_src = os.path.join(checkoutdir, name)
+        run_sync(['ostbuild', 'checkout', '--overwrite', '--manifest=' + self.manifest_path, name], cwd=checkoutdir)
+
         artifact_meta = dict(meta)
 
         metadata_path = os.path.join(component_src, '_ostbuild-meta.json')